[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtfont.C

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.199 by root, Thu Jun 17 00:08:35 2021 UTC vs.
Revision 1.223 by sf-exg, Sat Aug 19 17:44:35 2023 UTC

…		…
134	# endif	134	# endif
135	#endif	135	#endif
136		136
137	//{ CS_UNICODE, "--unifont---------c--iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.	137	//{ CS_UNICODE, "--unifont---------c--iso10646-1" }, // this gem of a font has actual dotted circles within the combining character glyphs.
138	#if XFT	138	#if XFT
139	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },	139	{ CS_UNICODE, "xft:DejaVu Sans Mono:antialias=false:autohint=true" },
140	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },	140	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
141	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },	141	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
142	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },	142	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
143		143
144	// FreeMono is usually uglier than x fonts, so try after the others	144	// FreeMono is usually uglier than x fonts, so try after the others
145	{ CS_UNICODE, "xft:FreeMono:autohint=true" },	145	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
146	#endif	146	#endif
147		147
…		…
313	if (unicode >= 0x2500 && unicode <= 0x259f &&	313	if (unicode >= 0x2500 && unicode <= 0x259f &&
314	!term->option (Opt_skipBuiltinGlyphs))	314	!term->option (Opt_skipBuiltinGlyphs))
315	return true;	315	return true;
316	#endif	316	#endif
317		317
318	if (IS_COMPOSE (unicode))	318	// we do not check for IS_COMPOSE here, as this would
319	return true;	319	// rob other fonts from taking over.
320		320
321	switch (unicode)	321	switch (unicode)
322	{	322	{
323	case ZERO_WIDTH_CHAR:	323	case ZERO_WIDTH_CHAR:
324	case NOCHAR:	324	case NOCHAR:
…		…
345		345
346	XSetForeground (disp, gc, term->pix_colors[fg]);	346	XSetForeground (disp, gc, term->pix_colors[fg]);
347		347
348	while (len)	348	while (len)
349	{	349	{
		350	const text_t *tp = text;
		351	text_t t = *tp;
		352
		353	while (++text, --len && *text == NOCHAR)
		354	;
		355
350	#if ENABLE_COMBINING	356	#if ENABLE_COMBINING
351	compose_char *cc;	357	compose_char *cc;
352	#endif	358	#endif
353	const text_t *tp = text;
354	text_t t = *tp;
355
356	while (++text, --len && *text == NOCHAR)
357	;
358
359	int width = text - tp;	359	int width = text - tp;
360	int fwidth = term->fwidth * width;	360	int fwidth = term->fwidth * width;
361		361
362	#ifdef BUILTIN_GLYPHS	362	#ifdef BUILTIN_GLYPHS
363	if (0x2500 <= t && t <= 0x259f)	363	if (0x2500 <= t && t <= 0x259f)
…		…
445	#endif	445	#endif
446	#if ENABLE_COMBINING	446	#if ENABLE_COMBINING
447	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	447	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
448	{	448	{
449	min_it (width, 2); // we only support wcwidth up to 2	449	min_it (width, 2); // we only support wcwidth up to 2
450
451	text_t chrs[2];	450	text_t chrs[2];
452	chrs [1] = NOCHAR;	451	chrs [1] = NOCHAR;
453		452
454	*chrs = cc->c1;	453	*chrs = cc->c1;
455	rxvt_font f1 = (fs)[fs->find_font_idx (cc->c1)];	454	rxvt_font f1 = (fs)[fs->find_font_idx (cc->c1)];
…		…
518	}	517	}
519		518
520	bool load (const rxvt_fontprop &prop, bool force_prop)	519	bool load (const rxvt_fontprop &prop, bool force_prop)
521	{	520	{
522	width = 1; height = 1;	521	width = 1; height = 1;
523	ascent = 1; descent = 0;	522	ascent = 1;
		523	descent = (*fs)[2]->descent;
524		524
525	set_name (strdup ("built-in rendition overflow font"));	525	set_name (strdup ("built-in rendition overflow font"));
526		526
527	return true;	527	return true;
528	}	528	}
…		…
1138		1138
1139	#if XFT	1139	#if XFT
1140		1140
1141	struct rxvt_font_xft : rxvt_font	1141	struct rxvt_font_xft : rxvt_font
1142	{	1142	{
		1143	#if XFT_CHAR_CACHE
		1144	// we cache the qascii range xoffsets in the name of speed,
		1145	// expecting terminals to deal mostly with these characters
		1146	// we also assume the xoff always fits into uint8_t,
		1147	// which is questionable, but let's see...
		1148	// also, it is uncomfortably big, due to the uints.
		1149	enum { char_cache_min = 0x20, char_cache_max = 0x7e };
		1150	uint8_t xoff_cache [char_cache_max - char_cache_min + 1];
		1151	FT_UInt glyph_cache [char_cache_max - char_cache_min + 1];
		1152	#endif
		1153
1143	rxvt_font_xft ()	1154	rxvt_font_xft ()
1144	{	1155	{
1145	f = 0;	1156	f = 0;
1146	}	1157	}
1147		1158
…		…
1253	break;	1264	break;
1254	}	1265	}
1255		1266
1256	FT_Face face = XftLockFace (f);	1267	FT_Face face = XftLockFace (f);
1257		1268
		1269	// fuck me plenty: XftLockFace can actually return 0. try not to crash.
		1270	// we also assume blindly that if the first lock succeeds, then subsequent
		1271	// locks will also succeed.
		1272	if (!face)
		1273	{
		1274	XftFontClose (disp, f);
		1275	success = false;
		1276	break;
		1277	}
		1278
1258	ascent = (face->size->metrics.ascender + 63) >> 6;	1279	ascent = (face->size->metrics.ascender + 63) >> 6;
1259	descent = (-face->size->metrics.descender + 63) >> 6;	1280	descent = (-face->size->metrics.descender + 63) >> 6;
1260	height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);	1281	height = max (ascent + descent, (face->size->metrics.height + 63) >> 6);
1261	width = 0;	1282	width = 0;
1262		1283
…		…
1293	if (glheight < g.height - g.y) glheight = g.height - g.y;	1314	if (glheight < g.height - g.y) glheight = g.height - g.y;
1294	}	1315	}
1295		1316
1296	if (!width)	1317	if (!width)
1297	{	1318	{
1298	rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);	1319	rxvt_warn ("unable to calculate font width for '%s', using max_advance_width.\n", name);
1299		1320	width = f->max_advance_width;
1300	XftFontClose (disp, f);
1301	f = 0;
1302
1303	success = false;
1304	break;	1321	break;
1305	}	1322	}
1306		1323
1307	if (prop.height == rxvt_fontprop::unset	1324	if (prop.height == rxvt_fontprop::unset
1308	\|\| (height <= prop.height && glheight <= prop.height)	1325	\|\| (height <= prop.height && glheight <= prop.height)
…		…
1335	clear ();	1352	clear ();
1336	success = false;	1353	success = false;
1337	}	1354	}
1338	#endif	1355	#endif
1339		1356
		1357	#if XFT_CHAR_CACHE
		1358	// populate char cache
		1359	for (FcChar16 ch = char_cache_min; ch <= char_cache_max; ++ch)
		1360	{
		1361	FT_UInt glyph = XftCharIndex (disp, f, ch);
		1362	glyph_cache [ch - char_cache_min] = glyph;
		1363
		1364	XGlyphInfo g;
		1365	XftGlyphExtents (disp, f, &glyph, 1, &g);
		1366	xoff_cache [ch - char_cache_min] = g.xOff;
		1367	}
		1368	#endif
		1369
1340	return success;	1370	return success;
1341	}	1371	}
1342		1372
1343	bool	1373	bool
1344	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const	1374	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1345	{	1375	{
1346	careful = false;	1376	careful = false;
1347		1377
		1378	// handle non-bmp chars when text_t is 16 bit
		1379	#if ENABLE_COMBINING && !UNICODE_3
		1380	if (ecb_expect_false (IS_COMPOSE (unicode)))
		1381	if (compose_char *cc = rxvt_composite [unicode])
		1382	if (cc->c2 == NOCHAR)
		1383	unicode = cc->c1;
		1384	else
		1385	return false;
		1386	else
		1387	return false;
		1388	#endif
		1389
		1390	FcChar32 chr = unicode;
		1391
1348	if (!XftCharExists (term->dpy, f, unicode))	1392	if (!XftCharExists (term->dpy, f, chr))
1349	return false;	1393	return false;
1350		1394
1351	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1395	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1352	return true;	1396	return true;
1353		1397
1354	// check character against base font bounding box	1398	int wcw = max (WCWIDTH (chr), 1);
1355	FcChar32 ch = unicode;	1399
1356	XGlyphInfo g;	1400	XGlyphInfo g;
1357	XftTextExtents32 (term->dpy, f, &ch, 1, &g);	1401	XftTextExtents32 (term->dpy, f, &chr, 1, &g);
		1402
		1403	int cwidth = prop->width * wcw;
		1404
		1405	// use same adjustments as in ->draw, see there
		1406	g.x += g.xOff ? cwidth - g.xOff >> 1 : 0;
		1407	g.x += g.xOff ? 0 : cwidth;
1358		1408
1359	int w = g.width - g.x;	1409	int w = g.width - g.x;
1360	int wcw = max (WCWIDTH (unicode), 1);
1361		1410
1362	careful = g.x > 0 \|\| w > prop->width * wcw;	1411	careful = g.x > 0 \|\| w > cwidth;
1363		1412
1364	if (careful && !OVERLAP_OK (w, wcw, prop))	1413	if (careful && !OVERLAP_OK (w, wcw, prop))
1365	return false;	1414	return false;
1366		1415
1367	// this weeds out _totally_ broken fonts, or glyphs	1416	// this weeds out _totally_ broken fonts, or glyphs
…		…
1374	void	1423	void
1375	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1424	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1376	const text_t *text, int len,	1425	const text_t *text, int len,
1377	int fg, int bg)	1426	int fg, int bg)
1378	{	1427	{
1379	XGlyphInfo extents;
1380	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);	1428	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1381	XftGlyphSpec *ep = enc;	1429	XftGlyphSpec *ep = enc;
1382		1430
1383	dTermDisplay;	1431	dTermDisplay;
1384	dTermGC;	1432	dTermGC;
…		…
1397	int y_ = buffered ? 0 : y;	1445	int y_ = buffered ? 0 : y;
1398		1446
1399	while (len)	1447	while (len)
1400	{	1448	{
1401	int cwidth = term->fwidth;	1449	int cwidth = term->fwidth;
1402	FcChar32 fc = *text++; len--;	1450	FcChar32 chr = *text++; len--;
1403		1451
1404	while (len && *text == NOCHAR)	1452	while (len && *text == NOCHAR)
1405	text++, len--, cwidth += term->fwidth;	1453	text++, len--, cwidth += term->fwidth;
1406		1454
1407	if (fc != ' ') // skip spaces	1455	if (chr != ' ') // skip spaces
		1456	{
		1457	// handle non-bmp chars when text_t is 16 bit
		1458	#if ENABLE_COMBINING && !UNICODE_3
		1459	if (ecb_expect_false (IS_COMPOSE (chr)))
		1460	if (compose_char *cc = rxvt_composite [chr])
		1461	if (cc->c2 == NOCHAR)
		1462	chr = cc->c1;
		1463	#endif
		1464
		1465	#if 0
		1466	FT_UInt glyphs [decltype (exp)::max_size];
		1467
		1468	for (int i = 0; i < nchrs; ++i)
		1469	glyphs [i] = XftCharIndex (disp, f, chrs [i]);
		1470
		1471	for (int i = 0; i < nchrs; ++i)
1408	{	1472	{
		1473	XGlyphInfo ep;
		1474	XftGlyphExtents (disp, f, glyphs+i, 1, &ep);
		1475	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);
		1476	}
		1477	#endif
		1478
		1479	FT_UInt glyph;
		1480	int xOff;
		1481
		1482	#if XFT_CHAR_CACHE
		1483	if (ecb_expect_true (IN_RANGE_INC (chr, char_cache_min, char_cache_max)))
		1484	{
		1485	glyph = glyph_cache [chr - char_cache_min];
		1486	xOff = xoff_cache [chr - char_cache_min];
		1487	}
		1488	else
		1489	#endif
		1490	{
1409	FT_UInt glyph = XftCharIndex (disp, f, fc);	1491	glyph = XftCharIndex (disp, f, chr);
		1492	XGlyphInfo extents;
1410	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1493	XftGlyphExtents (disp, f, &glyph, 1, &extents);
		1494	xOff = extents.xOff;
		1495	}
1411		1496
1412	ep->glyph = glyph;	1497	ep->glyph = glyph;
1413	ep->x = x_ + (cwidth - extents.xOff >> 1);	1498	ep->x = x_;
1414	ep->y = y_ + ascent;	1499	ep->y = y_ + ascent;
1415		1500
1416	if (extents.xOff == 0)	1501	// the xft font cell might differ from the terminal font cell,
		1502	// in which case we use the average between the two.
		1503	ep->x += xOff ? cwidth - xOff >> 1 : 0;
		1504
		1505	// xft/freetype represent combining characters as characters with zero
		1506	// width rendered over the previous character with some fonts, while
		1507	// in other fonts, they are considered normal characters, while yet
		1508	// in other fonts, they are shifted all over the place.
		1509	// we handle the first two cases by keying off on xOff being 0
		1510	// for zero-width chars. normally, we would add extents.xOff
		1511	// of the base character here, but we don't have that, so we use cwidth.
1417	ep->x = x_ + cwidth;	1512	ep->x += xOff ? 0 : cwidth;
1418		1513
1419	ep++;	1514	++ep;
1420	}	1515	}
1421		1516
1422	x_ += cwidth;	1517	x_ += cwidth;
1423	}	1518	}
1424		1519
…		…
1693	}	1788	}
1694		1789
1695	int	1790	int
1696	rxvt_fontset::find_font_idx (unicode_t unicode)	1791	rxvt_fontset::find_font_idx (unicode_t unicode)
1697	{	1792	{
1698	if (unicode >= 1<<20)	1793	// this limits fmap size. it has to accommodate COMPOSE_HI when UNICODE_3
		1794	if (unicode > 0x1fffff)
1699	return 0;	1795	return 0;
1700		1796
1701	unicode_t hi = unicode >> 8;	1797	unicode_t hi = unicode >> 8;
1702		1798
1703	if (hi < fmap.size ()	1799	if (hi < fmap.size ())
1704	&& fmap[hi]	1800	if (pagemap *pm = fmap[hi])
1705	&& (*fmap[hi])[unicode & 0xff] != 0xff)	1801	if ((*pm)[unicode & 0xff] != 0xff)
1706	return (*fmap[hi])[unicode & 0xff];	1802	return (*pm)[unicode & 0xff];
1707		1803
1708	unsigned int i;	1804	unsigned int i;
1709		1805
1710	for (i = 0; i < fonts.size (); i++)	1806	for (i = 0; i < fonts.size (); i++)
1711	{	1807	{
…		…
1735	}	1831	}
1736		1832
1737	next_font:	1833	next_font:
1738	if (i == fonts.size () - 1)	1834	if (i == fonts.size () - 1)
1739	{	1835	{
		1836	// compose characters are handled by the default font, unless another font takes over
		1837	// we do not go via the fallback list for speed reasons.
		1838	if (IS_COMPOSE (unicode))
		1839	return 0;
		1840
1740	if (fallback->name)	1841	if (fallback->name)
1741	{	1842	{
1742	// search through the fallback list	1843	// search through the fallback list
1743	push_font (new_font (fallback->name, fallback->cs));	1844	push_font (new_font (fallback->name, fallback->cs));
1744	fallback++;	1845	fallback++;

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.199 by root, Thu Jun 17 00:08:35 2021 UTC vs. Revision 1.223 by sf-exg, Sat Aug 19 17:44:35 2023 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.199 by root, Thu Jun 17 00:08:35 2021 UTC vs.
Revision 1.223 by sf-exg, Sat Aug 19 17:44:35 2023 UTC