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.182 by sf-exg, Fri Jul 29 09:41:22 2011 UTC vs.
Revision 1.209 by root, Fri Jun 18 21:58:03 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
… …
22#include "../config.h" 22#include "../config.h"
23#include "rxvt.h" 23#include "rxvt.h"
24#include "rxvtutil.h" 24#include "rxvtutil.h"
25#include "rxvtfont.h" 25#include "rxvtfont.h"
26 26
27#include <cstdlib> 27#include <stdlib.h>
28 28
29#include <inttypes.h> 29#include <inttypes.h>
30 30
31#if XFT 31#if XFT
32# include <fontconfig/fontconfig.h> 32# include <fontconfig/fontconfig.h>
… …
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 ();
… …
816 XFreeFontNames (list); 827 XFreeFontNames (list);
817 828
818 // this loop only iterates when the guessed font-size is too small 829 // this loop only iterates when the guessed font-size is too small
819 for (;;) 830 for (;;)
820 { 831 {
821 font_weight *best = fonts + count - 1; 832 font_weight *best = fonts;
822 833
823 for (font_weight *w = fonts; w < best; w++) 834 for (font_weight *w = fonts + 1; w < fonts + count; w++)
824 if (w->diff <= best->diff) 835 if (w->diff < best->diff)
825 best = w; 836 best = w;
826 837
827 if (!best->name 838 if (!best->name
828 || !(f = XLoadQueryFont (disp, best->name))) 839 || !(f = XLoadQueryFont (disp, best->name)))
829 break; 840 break;
… …
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 rxvt_compose_expand_static<FcChar32> exp;
1344 FcChar32 *chrs = exp (unicode);
1345 int nchrs = exp.length (chrs);
1346
1347 // allm chars in sequence must be available
1348 for (int i = 0; i < nchrs; ++i)
1330 if (!XftCharExists (term->dpy, f, unicode)) 1349 if (!XftCharExists (term->dpy, f, chrs [i]))
1331 return false; 1350 return false;
1332 1351
1333 if (!prop || prop->width == rxvt_fontprop::unset) 1352 if (!prop || prop->width == rxvt_fontprop::unset)
1334 return true; 1353 return true;
1335 1354
1336 // check character against base font bounding box 1355 int wcw = max (WCWIDTH (chrs [0]), 1);
1337 FcChar32 ch = unicode; 1356
1357 // we check against all glyph sizes. this is probably wrong,
1358 // due to the way ->draw positions these glyphs.
1359 for (int i = 0; i < nchrs; ++i)
1360 {
1338 XGlyphInfo g; 1361 XGlyphInfo g;
1339 XftTextExtents32 (term->dpy, f, &ch, 1, &g); 1362 XftTextExtents32 (term->dpy, f, chrs + i, 1, &g);
1340 1363
1341 int w = g.width - g.x; 1364 int w = g.width - g.x;
1342 int wcw = max (WCWIDTH (unicode), 1);
1343 1365
1344 careful = g.x > 0 || w > prop->width * wcw; 1366 careful = g.x > 0 || w > prop->width * wcw;
1345 1367
1346 if (careful && !OVERLAP_OK (w, wcw, prop)) 1368 if (careful && !OVERLAP_OK (w, wcw, prop))
1347 return false; 1369 return false;
1348 1370
1349 // this weeds out _totally_ broken fonts, or glyphs 1371 // this weeds out _totally_ broken fonts, or glyphs
1350 if (!OVERLAP_OK (g.xOff, wcw, prop)) 1372 if (!OVERLAP_OK (g.xOff, wcw, prop))
1351 return false; 1373 return false;
1374 }
1352 1375
1353 return true; 1376 return true;
1354} 1377}
1355 1378
1356void 1379void
1357rxvt_font_xft::draw (rxvt_drawable &d, int x, int y, 1380rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1358 const text_t *text, int len, 1381 const text_t *text, int len,
1359 int fg, int bg) 1382 int fg, int bg)
1360{ 1383{
1361 XGlyphInfo extents;
1362 XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len); 1384 //XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);//D
1363 XftGlyphSpec *ep = enc; 1385 //XftGlyphSpec *ep = enc;//D
1386 static vector<XftGlyphSpec> enc; enc.resize (0); // static to avoid malloc, still slow
1364 1387
1365 dTermDisplay; 1388 dTermDisplay;
1366 dTermGC; 1389 dTermGC;
1367 1390
1368 int w = term->fwidth * len; 1391 int w = term->fwidth * len;
… …
1379 int y_ = buffered ? 0 : y; 1402 int y_ = buffered ? 0 : y;
1380 1403
1381 while (len) 1404 while (len)
1382 { 1405 {
1383 int cwidth = term->fwidth; 1406 int cwidth = term->fwidth;
1407
1408 rxvt_compose_expand_static<FcChar32> exp;
1384 FcChar32 fc = *text++; len--; 1409 FcChar32 *chrs = exp (*text++); len--;
1410 int nchrs = exp.length (chrs);
1385 1411
1386 while (len && *text == NOCHAR) 1412 while (len && *text == NOCHAR)
1387 text++, len--, cwidth += term->fwidth; 1413 text++, len--, cwidth += term->fwidth;
1388 1414
1389 if (fc != ' ') // skip spaces 1415 if (chrs [0] != ' ') // skip spaces
1416 {
1417 #if 1
1418 FT_UInt glyphs [decltype (exp)::max_size];
1419
1420 for (int i = 0; i < nchrs; ++i)
1421 glyphs [i] = XftCharIndex (disp, f, chrs [i]);
1422
1423 for (int i = 0; i < nchrs; ++i)
1390 { 1424 {
1425 XGlyphInfo ep;
1426 XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
1427 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);
1428 }
1429 #endif
1430
1391 FT_UInt glyph = XftCharIndex (disp, f, fc); 1431 FT_UInt glyph = XftCharIndex (disp, f, chrs [0]);
1432 XGlyphInfo extents0;
1392 XftGlyphExtents (disp, f, &glyph, 1, &extents); 1433 XftGlyphExtents (disp, f, &glyph, 1, &extents0);
1393 1434
1435 int cx = x_ + (cwidth - extents0.xOff >> 1);
1436 int cy = y_ + ascent;
1437
1438 XftGlyphSpec ep;
1394 ep->glyph = glyph; 1439 ep.glyph = glyph;
1395 ep->x = x_ + (cwidth - extents.xOff >> 1); 1440 ep.x = cx + (extents0.xOff ? 0 : extents0.xOff);
1396 ep->y = y_ + ascent; 1441 ep.y = cy;
1397 1442
1398 if (extents.xOff == 0) 1443 enc.push_back (ep);
1399 ep->x = x_ + cwidth;
1400 1444
1401 ep++; 1445 for (int i = 1; ecb_expect_false (i < nchrs); ++i)
1446 {
1447 FT_UInt glyph = XftCharIndex (disp, f, chrs [i]);
1448 XGlyphInfo extents;
1449 XftGlyphExtents (disp, f, &glyph, 1, &extents);
1450
1451 ep.glyph = glyph;
1452 ep.x = cx + (extents.xOff ? 0 : extents0.xOff);
1453
1454 enc.push_back (ep);
1455 }
1402 } 1456 }
1403 1457
1404 x_ += cwidth; 1458 x_ += cwidth;
1405 } 1459 }
1406 1460
1407 if (buffered) 1461 if (buffered)
1408 { 1462 {
1409 if (ep != enc) 1463 if (!enc.empty ())
1410 { 1464 {
1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1465 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1412 1466
1413#ifdef HAVE_BG_PIXMAP 1467#ifdef HAVE_IMG
1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1468 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1415 1469
1416 if (term->bg_pixmap 1470 if (term->bg_img
1417 && (bg == Color_transparent || bg == Color_bg 1471 && (bg == Color_transparent || bg == Color_bg
1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1472 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1419 { 1473 {
1420 int src_x = x, src_y = y; 1474 int src_x = x, src_y = y;
1421 1475
… …
1423 { 1477 {
1424 src_x += term->window_vt_x; 1478 src_x += term->window_vt_x;
1425 src_y += term->window_vt_y; 1479 src_y += term->window_vt_y;
1426 } 1480 }
1427 1481
1428 if (term->bg_pmap_width >= src_x + w 1482 if (term->bg_img->w >= src_x + w
1429 && term->bg_pmap_height >= src_y + h) 1483 && term->bg_img->h >= src_y + h)
1430 { 1484 {
1431 XCopyArea (disp, term->bg_pixmap, d2, gc, 1485 XCopyArea (disp, term->bg_img->pm, d2, gc,
1432 src_x, src_y, w, h, 0, 0); 1486 src_x, src_y, w, h, 0, 0);
1433 } 1487 }
1434 else 1488 else
1435 { 1489 {
1436 XGCValues gcv; 1490 XGCValues gcv;
1437 1491
1438 gcv.fill_style = FillTiled; 1492 gcv.fill_style = FillTiled;
1439 gcv.tile = term->bg_pixmap; 1493 gcv.tile = term->bg_img->pm;
1440 gcv.ts_x_origin = -src_x; 1494 gcv.ts_x_origin = -src_x;
1441 gcv.ts_y_origin = -src_y; 1495 gcv.ts_y_origin = -src_y;
1442 1496
1443 XChangeGC (disp, gc, 1497 XChangeGC (disp, gc,
1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1498 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1460 } 1514 }
1461 else 1515 else
1462#endif 1516#endif
1463 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h); 1517 XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1464 1518
1465 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1519 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1466 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1520 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1467 } 1521 }
1468 else 1522 else
1469 clear_rect (d, x, y, w, h, bg); 1523 clear_rect (d, x, y, w, h, bg);
1470 } 1524 }
1471 else 1525 else
1472 { 1526 {
1473 clear_rect (d, x, y, w, h, bg); 1527 clear_rect (d, x, y, w, h, bg);
1474 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc); 1528 XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, &enc[0], enc.size ());
1475 } 1529 }
1476} 1530}
1477 1531
1478#endif 1532#endif
1479 1533
… …
1604 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1658 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1605 else 1659 else
1606 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1660 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1607 1661
1608 desc++; 1662 desc++;
1609 while (*desc <= ' ') desc++; 1663 while (*desc <= ' ' && *desc) desc++;
1610 } 1664 }
1611 1665
1612 end = strchr (desc, ','); 1666 end = strchr (desc, ',');
1613 if (!end) 1667 if (!end)
1614 end = desc + strlen (desc); 1668 end = desc + strlen (desc);
… …
1675} 1729}
1676 1730
1677int 1731int
1678rxvt_fontset::find_font_idx (unicode_t unicode) 1732rxvt_fontset::find_font_idx (unicode_t unicode)
1679{ 1733{
1680 if (unicode >= 1<<20) 1734 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1735 if (unicode > 0x1fffff)
1681 return 0; 1736 return 0;
1682 1737
1683 unicode_t hi = unicode >> 8; 1738 unicode_t hi = unicode >> 8;
1684 1739
1685 if (hi < fmap.size () 1740 if (hi < fmap.size ())
1686 && fmap[hi] 1741 if (pagemap *pm = fmap[hi])
1687 && (*fmap[hi])[unicode & 0xff] != 0xff) 1742 if ((*pm)[unicode & 0xff] != 0xff)
1688 return (*fmap[hi])[unicode & 0xff]; 1743 return (*pm)[unicode & 0xff];
1689 1744
1690 unsigned int i; 1745 unsigned int i;
1691 1746
1692 for (i = 0; i < fonts.size (); i++) 1747 for (i = 0; i < fonts.size (); i++)
1693 { 1748 {
… …
1717 } 1772 }
1718 1773
1719 next_font: 1774 next_font:
1720 if (i == fonts.size () - 1) 1775 if (i == fonts.size () - 1)
1721 { 1776 {
1777 // compose characters are handled by the default font, unless another font takes over
1778 // we do not go via the fallback list for speed reasons.
1779 if (IS_COMPOSE (unicode))
1780 return 0;
1781
1722 if (fallback->name) 1782 if (fallback->name)
1723 { 1783 {
1724 // search through the fallback list 1784 // search through the fallback list
1725 push_font (new_font (fallback->name, fallback->cs)); 1785 push_font (new_font (fallback->name, fallback->cs));
1726 fallback++; 1786 fallback++;
… …
1732 // way to configure this and xft is easier to hack in, 1792 // way to configure this and xft is easier to hack in,
1733 // while x11 has more framework in place already. 1793 // while x11 has more framework in place already.
1734 // TODO: this is a real resource hog, xft takes ages(?) 1794 // TODO: this is a real resource hog, xft takes ages(?)
1735#if XFT && USE_SLOW_LOOKUP 1795#if XFT && USE_SLOW_LOOKUP
1736 // grab the first xft font that seems suitable 1796 // grab the first xft font that seems suitable
1797 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1737 FcPattern *p = FcPatternCreate (); 1798 FcPattern *p = FcPatternCreate ();
1738 1799
1739 FcCharSet *s = FcCharSetCreate (); 1800 FcCharSet *s = FcCharSetCreate ();
1740 FcCharSetAddChar (s, unicode); 1801 FcCharSetAddChar (s, unicode);
1741 FcPatternAddCharSet (p, FC_CHARSET, s); 1802 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1785 while (hi >= fmap.size ()) 1846 while (hi >= fmap.size ())
1786 fmap.push_back (0); 1847 fmap.push_back (0);
1787 1848
1788 if (!fmap[hi]) 1849 if (!fmap[hi])
1789 { 1850 {
1790 fmap[hi] = (pagemap *)new pagemap; 1851 fmap[hi] = new pagemap;
1791 memset (fmap[hi], 0xff, sizeof (pagemap)); 1852 memset (fmap[hi], 0xff, sizeof (pagemap));
1792 } 1853 }
1793 1854
1794 (*fmap[hi])[unicode & 0xff] = i; 1855 (*fmap[hi])[unicode & 0xff] = i;
1795 } 1856 }

Diff Legend

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