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.181 by root, Wed Jun 22 16:06:52 2011 UTC vs.
Revision 1.205 by root, Thu Jun 17 14:55:05 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>
… …
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_)
… …
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)
… …
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 ();
… …
816 XFreeFontNames (list); 851 XFreeFontNames (list);
817 852
818 // this loop only iterates when the guessed font-size is too small 853 // this loop only iterates when the guessed font-size is too small
819 for (;;) 854 for (;;)
820 { 855 {
821 font_weight *best = fonts + count - 1; 856 font_weight *best = fonts;
822 857
823 for (font_weight *w = best; w-- > fonts; ) 858 for (font_weight *w = fonts + 1; w < fonts + count; w++)
824 if (w->diff <= best->diff) 859 if (w->diff < best->diff)
825 best = w; 860 best = w;
826 861
827 if (!best->name 862 if (!best->name
828 || !(f = XLoadQueryFont (disp, best->name))) 863 || !(f = XLoadQueryFont (disp, best->name)))
829 break; 864 break;
… …
924 } 959 }
925#endif 960#endif
926 961
927 width = 1; 962 width = 1;
928 963
929 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; ) 964 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
930 { 965 {
931 if (FROM_UNICODE (cs, *t) == NOCHAR) 966 if (FROM_UNICODE (cs, *t) == NOCHAR)
932 continue; 967 continue;
933 968
934 // ignore characters we wouldn't use anyways 969 // ignore characters we wouldn't use anyways
935 bool careful; 970 bool careful;
936 if (!has_char (*t, &prop, careful)) 971 if (!has_char (*t, &prop, careful))
937 continue; 972 continue;
938 973
939 XChar2b ch = { *t >> 8, *t }; 974 // the casts are needed in C++11 (see 8.5.1)
975 XChar2b ch = { (unsigned char)(*t >> 8), (unsigned char)*t };
940 976
941 XCharStruct g; 977 XCharStruct g;
942 int dir_ret, asc_ret, des_ret; 978 int dir_ret, asc_ret, des_ret;
943 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g); 979 XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
944 980
… …
1044 dTermDisplay; 1080 dTermDisplay;
1045 dTermGC; 1081 dTermGC;
1046 1082
1047 bool slow = this->slow 1083 bool slow = this->slow
1048 || width != term->fwidth 1084 || width != term->fwidth
1049 || height != term->fheight; 1085 || height != term->fheight
1086 || ascent != f->ascent;
1050 1087
1051 int base = ascent; // sorry, incorrect: term->fbase; 1088 int base = ascent; // sorry, incorrect: term->fbase;
1052 1089
1053 XGCValues v; 1090 XGCValues v;
1054 v.foreground = term->pix_colors[fg]; 1091 v.foreground = term->pix_colors[fg];
… …
1122 1159
1123///////////////////////////////////////////////////////////////////////////// 1160/////////////////////////////////////////////////////////////////////////////
1124 1161
1125#if XFT 1162#if XFT
1126 1163
1127struct rxvt_font_xft : rxvt_font { 1164struct rxvt_font_xft : rxvt_font
1165{
1128 rxvt_font_xft () { f = 0; } 1166 rxvt_font_xft ()
1167 {
1168 can_compose = true;
1169 f = 0;
1170 }
1129 1171
1130 void clear (); 1172 void clear ();
1131 1173
1132 rxvt_fontprop properties (); 1174 rxvt_fontprop properties ();
1133 1175
… …
1246 1288
1247 XftUnlockFace (f); 1289 XftUnlockFace (f);
1248 1290
1249 int glheight = height; 1291 int glheight = height;
1250 1292
1251 for (uint16_t *t = extent_test_chars + ecb_array_length (extent_test_chars); t-- > extent_test_chars; ) 1293 for (uint16_t *t = extent_test_chars; t < extent_test_chars + ecb_array_length (extent_test_chars); t++)
1252 { 1294 {
1253 FcChar16 ch = *t; 1295 FcChar16 ch = *t;
1254 1296
1255 if (cs != CS_UNICODE 1297 if (cs != CS_UNICODE
1256 && ch > 0x100 1298 && ch > 0x100
… …
1275 if (glheight < g.height - g.y) glheight = g.height - g.y; 1317 if (glheight < g.height - g.y) glheight = g.height - g.y;
1276 } 1318 }
1277 1319
1278 if (!width) 1320 if (!width)
1279 { 1321 {
1280 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);
1281 1323 width = f->max_advance_width;
1282 XftFontClose (disp, f);
1283 f = 0;
1284
1285 success = false;
1286 break; 1324 break;
1287 } 1325 }
1288 1326
1289 if (prop.height == rxvt_fontprop::unset 1327 if (prop.height == rxvt_fontprop::unset
1290 || (height <= prop.height && glheight <= prop.height) 1328 || (height <= prop.height && glheight <= prop.height)
… …
1325bool 1363bool
1326rxvt_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
1327{ 1365{
1328 careful = false; 1366 careful = false;
1329 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
1330 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)))
1331 return false; 1382 return false;
1332 1383
1333 if (!prop || prop->width == rxvt_fontprop::unset) 1384 if (!prop || prop->width == rxvt_fontprop::unset)
1334 return true; 1385 return true;
1335 1386
… …
1381 while (len) 1432 while (len)
1382 { 1433 {
1383 int cwidth = term->fwidth; 1434 int cwidth = term->fwidth;
1384 FcChar32 fc = *text++; len--; 1435 FcChar32 fc = *text++; len--;
1385 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
1443
1386 while (len && *text == NOCHAR) 1444 while (len && *text == NOCHAR)
1387 text++, len--, cwidth += term->fwidth; 1445 text++, len--, cwidth += term->fwidth;
1388 1446
1389 if (fc != ' ') // skip spaces 1447 if (fc != ' ') // skip spaces
1390 { 1448 {
… …
1408 { 1466 {
1409 if (ep != enc) 1467 if (ep != enc)
1410 { 1468 {
1411 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1469 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1412 1470
1413#ifdef HAVE_BG_PIXMAP 1471#ifdef HAVE_IMG
1414 Picture dst = 0; // the only assignment is done conditionally in the following if condition 1472 Picture dst = 0; // the only assignment is done conditionally in the following if condition
1415 1473
1416 if (term->bg_pixmap 1474 if (term->bg_img
1417 && (bg == Color_transparent || bg == Color_bg 1475 && (bg == Color_transparent || bg == Color_bg
1418 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1476 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1419 { 1477 {
1420 int src_x = x, src_y = y; 1478 int src_x = x, src_y = y;
1421 1479
… …
1423 { 1481 {
1424 src_x += term->window_vt_x; 1482 src_x += term->window_vt_x;
1425 src_y += term->window_vt_y; 1483 src_y += term->window_vt_y;
1426 } 1484 }
1427 1485
1428 if (term->bg_pmap_width >= src_x + w 1486 if (term->bg_img->w >= src_x + w
1429 && term->bg_pmap_height >= src_y + h) 1487 && term->bg_img->h >= src_y + h)
1430 { 1488 {
1431 XCopyArea (disp, term->bg_pixmap, d2, gc, 1489 XCopyArea (disp, term->bg_img->pm, d2, gc,
1432 src_x, src_y, w, h, 0, 0); 1490 src_x, src_y, w, h, 0, 0);
1433 } 1491 }
1434 else 1492 else
1435 { 1493 {
1436 XGCValues gcv; 1494 XGCValues gcv;
1437 1495
1438 gcv.fill_style = FillTiled; 1496 gcv.fill_style = FillTiled;
1439 gcv.tile = term->bg_pixmap; 1497 gcv.tile = term->bg_img->pm;
1440 gcv.ts_x_origin = -src_x; 1498 gcv.ts_x_origin = -src_x;
1441 gcv.ts_y_origin = -src_y; 1499 gcv.ts_y_origin = -src_y;
1442 1500
1443 XChangeGC (disp, gc, 1501 XChangeGC (disp, gc,
1444 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1502 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
… …
1604 cs = codeset_from_name (spec + sizeof ("codeset=") - 1); 1662 cs = codeset_from_name (spec + sizeof ("codeset=") - 1);
1605 else 1663 else
1606 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec); 1664 rxvt_warn ("unknown parameter '%s' in font specification, skipping.\n", spec);
1607 1665
1608 desc++; 1666 desc++;
1609 while (*desc <= ' ') desc++; 1667 while (*desc <= ' ' && *desc) desc++;
1610 } 1668 }
1611 1669
1612 end = strchr (desc, ','); 1670 end = strchr (desc, ',');
1613 if (!end) 1671 if (!end)
1614 end = desc + strlen (desc); 1672 end = desc + strlen (desc);
… …
1675} 1733}
1676 1734
1677int 1735int
1678rxvt_fontset::find_font_idx (unicode_t unicode) 1736rxvt_fontset::find_font_idx (unicode_t unicode)
1679{ 1737{
1680 if (unicode >= 1<<20) 1738 // this limits fmap size. it has to accomodate COMPOSE_HI when UNICODE_3
1739 if (unicode > 0x1fffff)
1681 return 0; 1740 return 0;
1682 1741
1683 unicode_t hi = unicode >> 8; 1742 unicode_t hi = unicode >> 8;
1684 1743
1685 if (hi < fmap.size () 1744 if (hi < fmap.size ())
1686 && fmap[hi] 1745 if (pagemap *pm = fmap[hi])
1687 && (*fmap[hi])[unicode & 0xff] != 0xff) 1746 if ((*pm)[unicode & 0xff] != 0xff)
1688 return (*fmap[hi])[unicode & 0xff]; 1747 return (*pm)[unicode & 0xff];
1689 1748
1690 unsigned int i; 1749 unsigned int i;
1691 1750
1692 for (i = 0; i < fonts.size (); i++) 1751 for (i = 0; i < fonts.size (); i++)
1693 { 1752 {
… …
1717 } 1776 }
1718 1777
1719 next_font: 1778 next_font:
1720 if (i == fonts.size () - 1) 1779 if (i == fonts.size () - 1)
1721 { 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
1722 if (fallback->name) 1786 if (fallback->name)
1723 { 1787 {
1724 // search through the fallback list 1788 // search through the fallback list
1725 push_font (new_font (fallback->name, fallback->cs)); 1789 push_font (new_font (fallback->name, fallback->cs));
1726 fallback++; 1790 fallback++;
… …
1732 // way to configure this and xft is easier to hack in, 1796 // way to configure this and xft is easier to hack in,
1733 // while x11 has more framework in place already. 1797 // while x11 has more framework in place already.
1734 // TODO: this is a real resource hog, xft takes ages(?) 1798 // TODO: this is a real resource hog, xft takes ages(?)
1735#if XFT && USE_SLOW_LOOKUP 1799#if XFT && USE_SLOW_LOOKUP
1736 // grab the first xft font that seems suitable 1800 // grab the first xft font that seems suitable
1801 // TOOD: should go first for cellchar (spacing 110) then mono, then else
1737 FcPattern *p = FcPatternCreate (); 1802 FcPattern *p = FcPatternCreate ();
1738 1803
1739 FcCharSet *s = FcCharSetCreate (); 1804 FcCharSet *s = FcCharSetCreate ();
1740 FcCharSetAddChar (s, unicode); 1805 FcCharSetAddChar (s, unicode);
1741 FcPatternAddCharSet (p, FC_CHARSET, s); 1806 FcPatternAddCharSet (p, FC_CHARSET, s);
… …
1785 while (hi >= fmap.size ()) 1850 while (hi >= fmap.size ())
1786 fmap.push_back (0); 1851 fmap.push_back (0);
1787 1852
1788 if (!fmap[hi]) 1853 if (!fmap[hi])
1789 { 1854 {
1790 fmap[hi] = (pagemap *)new pagemap; 1855 fmap[hi] = new pagemap;
1791 memset (fmap[hi], 0xff, sizeof (pagemap)); 1856 memset (fmap[hi], 0xff, sizeof (pagemap));
1792 } 1857 }
1793 1858
1794 (*fmap[hi])[unicode & 0xff] = i; 1859 (*fmap[hi])[unicode & 0xff] = i;
1795 } 1860 }

Diff Legend

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