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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.133 by root, Wed Jan 23 06:49:30 2008 UTC vs.
Revision 1.157 by root, Tue Mar 30 23:38:02 2010 UTC

…		…
1	/----------------------------------------------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
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 2 of the License, or
79		79
80	// japanese	80	// japanese
81	#if ENCODING_JP \|\| ENCODING_JP_EXT	81	#if ENCODING_JP \|\| ENCODING_JP_EXT
82	# if XFT	82	# if XFT
83	// prefer xft for complex scripts	83	// prefer xft for complex scripts
		84	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
84	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },
85	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
86	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },	86	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
87	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
88	# endif	88	# endif
89	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	89	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
90	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	90	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
…		…
216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
217	{	217	{
218	}	218	}
219		219
220	void	220	void
221	rxvt_font::set_name (char *name)	221	rxvt_font::set_name (char *name_)
222	{	222	{
223	if (this->name == name)	223	if (name == name_)
224	return;	224	return;
225		225
226	if (this->name) free (this->name); // let the compiler optimize	226	if (name) free (name); // let the compiler optimize
227	this->name = name;	227	name = name_;
228	}	228	}
229		229
230	void	230	void
231	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	231	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
232	{	232	{
…		…
236	if (color == Color_bg \|\| color == Color_transparent)	236	if (color == Color_bg \|\| color == Color_transparent)
237	XClearArea (disp, d, x, y, w, h, false);	237	XClearArea (disp, d, x, y, w, h, false);
238	else if (color >= 0)	238	else if (color >= 0)
239	{	239	{
240	#if XFT	240	#if XFT
241	bool done = false;	241	Picture dst;
242		242
243	# ifdef HAVE_BG_PIXMAP	243	# ifdef HAVE_BG_PIXMAP
244	if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ())	244	if (term->bgPixmap.pixmap
245	{	245	&& !term->pix_colors[color].is_opaque ()
246	Picture dst = XftDrawPicture (d);	246	&& ((dst = XftDrawPicture (d))))
247
248	if (dst != 0)
249	{	247	{
250	XClearArea (disp, d, x, y, w, h, false);	248	XClearArea (disp, d, x, y, w, h, false);
		249
251	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);	250	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
252	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);	251	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
253	done = true;
254	}	252	}
255	}	253	else
256	# endif	254	# endif
257	if (!done)
258	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	255	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
259		256
260	#else	257	#else
261	XSetForeground (disp, gc, term->pix_colors[color]);	258	XSetForeground (disp, gc, term->pix_colors[color]);
262	XFillRectangle (disp, d, gc, x, y, w, h);	259	XFillRectangle (disp, d, gc, x, y, w, h);
…		…
451		448
452	text_t chrs[2];	449	text_t chrs[2];
453	chrs [1] = NOCHAR;	450	chrs [1] = NOCHAR;
454		451
455	*chrs = cc->c1;	452	*chrs = cc->c1;
456	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	453	rxvt_font *f1 = fs->get (cc->c1);
457	f1->draw (d, x, y, chrs, width, fg, bg);	454	f1->draw (d, x, y, chrs, width, fg, bg);
458		455
459	if (cc->c2 != NOCHAR)	456	if (cc->c2 != NOCHAR)
460	{	457	{
461	bool careful;	458	bool careful;
462		459
463	// prefer font of first character, for no good reasons	460	// prefer font of first character, for no good reasons
464	*chrs = cc->c2;	461	*chrs = cc->c2;
465	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	462	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
466	? f1	463	? f1
467	: (*fs)[fs->find_font (cc->c2)];	464	: fs->get (cc->c2);
468		465
469	f2->draw (d, x, y, chrs, width, fg, Color_none);	466	f2->draw (d, x, y, chrs, width, fg, Color_none);
470	}	467	}
471	}	468	}
472	#endif	469	#endif
…		…
795	return false;	792	return false;
796		793
797	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	794	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
798	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	795	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
799		796
		797	cs = CS_UNKNOWN;
		798
800	if (registry && encoding)	799	if (registry && encoding)
801	{	800	{
802	char charset[64];	801	char charset[64];
803	snprintf (charset, 64, "%s-%s", registry, encoding);	802	snprintf (charset, 64, "%s-%s", registry, encoding);
804		803
805	cs = codeset_from_name (charset);	804	cs = codeset_from_name (charset);
		805
		806	if (cs == CS_UNKNOWN)
		807	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
806	}	808	}
807	else	809
		810	free (registry);
		811	free (encoding);
		812
		813	if (cs == CS_UNKNOWN)
808	{	814	{
809	const char *charset = get_property (f, XA_FONT, 0);	815	const char *charset = get_property (f, XA_FONT, 0);
810		816
811	if (!charset)	817	if (!charset)
812	charset = name;	818	charset = name;
…		…
815	while (*charset)	821	while (*charset)
816	if (*charset++ == '-' && !--count)	822	if (*charset++ == '-' && !--count)
817	break;	823	break;
818		824
819	cs = codeset_from_name (charset);	825	cs = codeset_from_name (charset);
		826	if (cs == CS_UNKNOWN)
		827	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		828	}
		829
		830	if (cs == CS_UNKNOWN)
820	}	831	{
821		832	clear ();
822	free (registry);	833	return false;
823	free (encoding);	834	}
824		835
825	if (cs == CS_UNICODE)	836	if (cs == CS_UNICODE)
826	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	837	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
827		838
828	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	839	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
873		884
874	int wcw = WCWIDTH (*t);	885	int wcw = WCWIDTH (*t);
875	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	886	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
876		887
877	if (width < g.width) width = g.width;	888	if (width < g.width) width = g.width;
878	}
879
880	if (cs == CS_UNKNOWN)
881	{
882	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
883
884	clear ();
885	return false;
886	}	889	}
887		890
888	#if 0 // do it per-character	891	#if 0 // do it per-character
889	if (prop && width > prop->width)	892	if (prop && width > prop->width)
890	{	893	{
…		…
1136	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1139	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1137		1140
1138	#if 0 // clipping unfortunately destroys our precious double-width-characters	1141	#if 0 // clipping unfortunately destroys our precious double-width-characters
1139	// clip width, we can't do better, or can we?	1142	// clip width, we can't do better, or can we?
1140	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1143	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1141	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1144	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1142	#endif	1145	#endif
1143		1146
1144	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1147	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1145	FcPatternAddBool (p, FC_MINSPACE, 1);	1148	FcPatternAddBool (p, FC_MINSPACE, 1);
1146		1149
…		…
1290	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1293	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1291	const text_t *text, int len,	1294	const text_t *text, int len,
1292	int fg, int bg)	1295	int fg, int bg)
1293	{	1296	{
1294	XGlyphInfo extents;	1297	XGlyphInfo extents;
1295	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1298	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1296	XftGlyphSpec *ep = enc;	1299	XftGlyphSpec *ep = enc;
1297		1300
1298	dTermDisplay;	1301	dTermDisplay;
1299	dTermGC;	1302	dTermGC;
1300		1303
1301	int w = term->fwidth * len;	1304	int w = term->fwidth * len;
1302	int h = term->fheight;	1305	int h = term->fheight;
1303		1306
1304	/*
1305	* Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1306	* good idea from the perspective of packaging for wide variety of user configs.
1307	*/
1308	bool buffered = bg >= Color_transparent;	1307	bool buffered = bg >= Color_transparent
1309	#ifdef FORCE_UNBUFFERED_XFT	1308	&& term->option (Opt_buffered);
1310	buffered = false;
1311	#endif
1312		1309
1313	// cut trailing spaces	1310	// cut trailing spaces
1314	while (len && text [len - 1] == ' ')	1311	while (len && text [len - 1] == ' ')
1315	len--;	1312	len--;
1316		1313
…		…
1345		1342
1346	if (buffered)	1343	if (buffered)
1347	{	1344	{
1348	if (ep != enc)	1345	if (ep != enc)
1349	{	1346	{
1350	bool back_rendered = false;
1351	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1347	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1352		1348
1353	#ifdef HAVE_BG_PIXMAP	1349	#ifdef HAVE_BG_PIXMAP
		1350	Picture dst = 0; // the only assignment is done conditionally in the following if condition
		1351
1354	if (term->bgPixmap.pixmap)	1352	if (term->bgPixmap.pixmap
		1353	&& (bg == Color_transparent \|\| bg == Color_bg
		1354	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1355	{	1355	{
1356	Picture dst = 0;	1356	int src_x = x, src_y = y;
1357		1357
1358	if (bg >= 0 && term->pix_colors[bg].is_opaque ())	1358	if (term->bgPixmap.is_parentOrigin ())
1359	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1359	{
		1360	src_x += term->window_vt_x;
		1361	src_y += term->window_vt_y;
		1362	}
		1363
		1364	if (term->bgPixmap.pmap_width >= src_x + w
		1365	&& term->bgPixmap.pmap_height >= src_y + h)
		1366	{
		1367	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1368	src_x, src_y, w, h, 0, 0);
		1369	}
1360	else	1370	else
1361	dst = XftDrawPicture (d2);	1371	{
		1372	XGCValues gcv;
		1373
		1374	gcv.fill_style = FillTiled;
		1375	gcv.tile = term->bgPixmap.pixmap;
		1376	gcv.ts_x_origin = -src_x;
		1377	gcv.ts_y_origin = -src_y;
		1378
		1379	XChangeGC (disp, gc,
		1380	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1381	&gcv);
		1382
		1383	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1384
		1385	gcv.fill_style = FillSolid;
		1386	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1387	}
1362		1388
1363	if (dst)	1389	if (dst)
1364	{	1390	{
1365	int src_x = x, src_y = y;
1366
1367	if (term->bgPixmap.is_parentOrigin ())
1368	{
1369	src_x += term->window_vt_x;
1370	src_y += term->window_vt_y;
1371	}
1372
1373	if (term->bgPixmap.pmap_width >= src_x+w
1374	&& term->bgPixmap.pmap_height >= src_y+h)
1375	{
1376	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1377	src_x, src_y, w, h, 0, 0);
1378	}
1379	else
1380	{
1381	XGCValues gcv;
1382
1383	gcv.fill_style = FillTiled;
1384	gcv.tile = term->bgPixmap.pixmap;
1385	gcv.ts_x_origin = -src_x;
1386	gcv.ts_y_origin = -src_y;
1387
1388	XChangeGC (disp, gc,
1389	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1390	&gcv);
1391
1392	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1393
1394	gcv.fill_style = FillSolid;
1395	XChangeGC (disp, gc, GCFillStyle, &gcv);
1396	}
1397
1398	if (bg >= 0)
1399	{
1400	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);	1391	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1392
		1393	// dst can only be set when bg >= 0
1401	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);	1394	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1402	}
1403
1404	back_rendered = true;
1405	}	1395	}
1406	}	1396	}
		1397	else
1407	#endif	1398	#endif
1408
1409	if (!back_rendered)
1410	XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);	1399	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1411		1400
1412	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1401	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1413	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1402	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1414	}	1403	}
1415	else	1404	else
…		…
1597		1586
1598	return -1;	1587	return -1;
1599	}	1588	}
1600		1589
1601	int	1590	int
1602	rxvt_fontset::find_font (unicode_t unicode)	1591	rxvt_fontset::find_font_idx (unicode_t unicode, bool &careful)
1603	{	1592	{
1604	if (unicode >= 1<<20)	1593	if (unicode >= 1<<20)
1605	return 0;	1594	return 0;
1606		1595
1607	unicode_t hi = unicode >> 8;	1596	unicode_t hi = unicode >> 8;
1608		1597
1609	if (hi < fmap.size ()	1598	if (hi < fmap.size () && fmap[hi])
1610	&& fmap[hi]	1599	{
1611	&& (*fmap[hi])[unicode & 0xff] != 0xff)	1600	unsigned char m = (*fmap[hi])[unicode & 0xff];
1612	return (*fmap[hi])[unicode & 0xff];	1601
		1602	if (m != 0xff)
		1603	{
		1604	careful = m & 128;
		1605	return m & 127;
		1606	}
		1607	}
1613		1608
1614	unsigned int i;	1609	unsigned int i;
1615		1610
1616	for (i = 0; i < fonts.size (); i++)	1611	for (i = 0; i < fonts.size (); i++)
1617	{	1612	{
…		…
1630	}	1625	}
1631		1626
1632	if (f->cs == CS_UNKNOWN)	1627	if (f->cs == CS_UNKNOWN)
1633	goto next_font;	1628	goto next_font;
1634		1629
1635	bool careful;
1636	if (f->has_char (unicode, &prop, careful))	1630	if (f->has_char (unicode, &prop, careful))
1637	{
1638	if (careful)
1639	i \|= 128;
1640
1641	goto found;	1631	goto found;
1642	}
1643		1632
1644	next_font:	1633	next_font:
1645	if (i == fonts.size () - 1)	1634	if (i == fonts.size () - 1)
1646	{	1635	{
1647	if (fallback->name)	1636	if (fallback->name)
…		…
1686	FcPatternDestroy (match);	1675	FcPatternDestroy (match);
1687		1676
1688	if (find_font (font) < 0)	1677	if (find_font (font) < 0)
1689	{	1678	{
1690	char fontname[4096];	1679	char fontname[4096];
1691	sprintf (fontname, "xft:%-.4090s", font);	1680	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1692		1681
1693	fonts.push_back (new_font (fontname, CS_UNICODE));	1682	fonts.push_back (new_font (fontname, CS_UNICODE));
1694	}	1683	}
1695		1684
1696	free (font);	1685	free (font);
…		…
1700	}	1689	}
1701	}	1690	}
1702		1691
1703	/* we must return SOME font */	1692	/* we must return SOME font */
1704	i = 0;	1693	i = 0;
		1694	careful = false;
1705		1695
1706	found:	1696	found:
1707	// found a font, cache it	1697	// found a font, cache it
1708	if (i < 255)	1698	if (i < 127)
1709	{	1699	{
1710	while (hi >= fmap.size ())	1700	while (hi >= fmap.size ())
1711	fmap.push_back (0);	1701	fmap.push_back (0);
1712		1702
1713	if (!fmap[hi])	1703	if (!fmap[hi])
1714	{	1704	{
1715	fmap[hi] = (pagemap *)new pagemap;	1705	fmap[hi] = (pagemap *)new pagemap;
1716	memset (fmap[hi], 0xff, sizeof (pagemap));	1706	memset (fmap[hi], 0xff, sizeof (pagemap));
1717	}	1707	}
1718		1708
1719	(*fmap[hi])[unicode & 0xff] = i;	1709	(*fmap[hi])[unicode & 0xff] = i \| (careful ? 128 : 0);
1720	}	1710	}
1721		1711
1722	return i;	1712	return i;
1723	}	1713	}
1724		1714
		1715	int
		1716	rxvt_fontset::find_font (unicode_t unicode)
		1717	{
		1718	bool careful;
		1719	int id = find_font_idx (unicode, careful);
1725		1720
		1721	return min<int> (fontCount, id) \| (careful ? Careful : 0);
		1722	}
1726		1723

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.133 by root, Wed Jan 23 06:49:30 2008 UTC vs. Revision 1.157 by root, Tue Mar 30 23:38:02 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.133 by root, Wed Jan 23 06:49:30 2008 UTC vs.
Revision 1.157 by root, Tue Mar 30 23:38:02 2010 UTC